Rename our "round" to "si_round".

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 1710e10e6bc9026d96b5c0a2c67d65b023396785..6c8629a0e0a9b300f1c086e71609c4d4c4f4b038 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -202,7 +202,7 @@ char * xstrdup(const char *s);
  * to deal with possible floating-point representation errors.
  */
 
-signed int round( double d );
+signed int si_round( double d );
 
 /* 
  * Data types for Palm/OS files.

diff --git a/gpsbabel/gpspilot.c b/gpsbabel/gpspilot.c
index f6e508ed835a2bcf1c97fd3ad76b8c3f1bb26d05..80fa6749b24d7d021de290a182911d5a2cbb6c49 100644 (file)
--- a/gpsbabel/gpspilot.c
+++ b/gpsbabel/gpspilot.c
@@ -128,9 +128,9 @@ gpspilot_writewpt(waypoint *wpt)
 
        rec = xcalloc(sizeof(*rec)+46,1);
        
-       be_write32(&rec->longitude, round(wpt->position.longitude.degrees * 3.6e6));
-       be_write32(&rec->latitude, round(wpt->position.latitude.degrees * 3.6e6));
-       be_write16(&rec->elevation, round(wpt->position.altitude.altitude_meters));
+       be_write32(&rec->longitude, si_round(wpt->position.longitude.degrees * 3.6e6));
+       be_write32(&rec->latitude, si_round(wpt->position.latitude.degrees * 3.6e6));
+       be_write16(&rec->elevation, si_round(wpt->position.altitude.altitude_meters));
        be_write16(&rec->magvar, 0 );
        
        vdata = (char *)rec + sizeof(*rec);

diff --git a/gpsbabel/magnav.c b/gpsbabel/magnav.c
index 3e0c5c059387c69d3dc434efac75fde710d8cfe3..93de8a7ccb2d62f90b60868c35286cfaee2b0502 100644 (file)
--- a/gpsbabel/magnav.c
+++ b/gpsbabel/magnav.c
@@ -173,8 +173,8 @@ my_writewpt(waypoint *wpt)
        
         be_write16( &rec->unknown2, 0);
        
-       be_write32(&rec->longitude, round(wpt->position.longitude.degrees * 100000.0));
-       be_write32(&rec->latitude, round(wpt->position.latitude.degrees * 100000.0));
+       be_write32(&rec->longitude, si_round(wpt->position.longitude.degrees * 100000.0));
+       be_write32(&rec->latitude, si_round(wpt->position.latitude.degrees * 100000.0));
        be_write32(&rec->elevation, wpt->position.altitude.altitude_meters);
 
        rec->plot = 0;

diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index b747678621b4e78f4b9e41452848051b226ab886..190920290e8e3604582ca50def37728802f1dcfd 100644 (file)
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -171,7 +171,7 @@ le_write32(void *addr, unsigned value)
 }
 
 signed int 
-round( double d )
+si_round( double d )
 {
        if ( d < 0 ) {
                return (signed int)(d-0.5);